Version: Darren ver1.1 fixing line