New version

Ready for Malcolms level