Updates suggested by @saivann