Last Code improvements :)