Fixed stuff. hand in right place