Continued with modifications