Initial commit #SP-1 Fixed