Functional improvements (aka looks better as a demo)