Issue no. 2 solved