Changed expectations a bit