removed all session queries and replaced with engine ones