1st project - some improvements