Updated to make things prettier