Issue no. 7 solved, issue no. 6 work in progress