No spawn radius & improved energy restoring