removed garbage code for new and improved methods