Issue no. 1 - solved