committing my changed because i have to give this computer back :(