changes made according to input from Felikaan