Changed to make it more fluid