Removed 'force_square' in favour of a more general 'aspect' parameter