removed unecessary code, different approach again