Fully 1.2.1 working version