Few more changes #38