consolidated methods and added features