Now broken. Added some logic though.