Implementation for Development issue 1

Please verify.