you really should rework it...