Merged in proper guiding code