Rewrote block so that it flows more nicely