Final guides changes