Complete - task : Modified some code 


Signed-off-by: jhammell <jhammell@NEON-081I.NEON.local>