New changes...it should be checked more precisely and also commit correctly