Making things work a bit better