removed deprecated and added new methods