Small alterations, added goyo