Changed to follow previous pattern