Last Bug Corrected - Final Version