Updated changes and working from 'test' branch