Fixed the rest