Small amnedments - first part