Working on refactoring copy and paste

Work around for copy and paste