Added helper method
Upped version