Modified to match my liking