Refactor try 2

Just merge