Untested Consolidation and Fix of Fluffy Position
merge upstream