litle more unncessary code gone