Fixed a bug + implemented changed task
added hw #3