tweaked for athena