Correcting some naming and giving CURRENT a value