some polish to make it deployable