Tweaked the Entperise slightly