tweaked for convenience