Steve suggestions added