tweaked for studio challenges