Behaviour changes and logging added
Consolidating
Can drop into Bucket