Fully working version that is currently working and checked into P4