changes according to input from Silox