Changed to fit specifications