Changed back to old method