Some little comdification