Improvements part 1