added angular expansion strategy and lenient water attack