@fpotter's suggetsions