@zacc, you're right, this method is still wrong. Modifying now. Can you, please, take a look over this again?