Topic/aws

Worth putting a comment about where this magic number came from? :)