Minor adjustment after testing