removed crazy logic