Hypemachine support

Add suggestions from hype machine