Just some tinkering and small modifications