Removed crazy logic