Improved and followed pattern suggestions