Magn4349

@junmendoza please review it