Updates from configs @ work
Updates from syncing with lappy