Changed to straightforward method.