Combined all FLOT code in place

Combined all FLOT code in place