Applied feedback from Justin and Sebastian