Updated code from development branch