Initial commit - Final Ibrahim modification