@LoganArnett & @rgcoders refactor add