updated again for a better fit