Final Refactor fix veriable fix for loob