Some little stuff added