Expanded to deal with the requirements

Built for CDO Seoul