better logic - screw that