Updated boss functionality