Modified a littlebit