removed some green code, added supress warnings, changed method names to better represent situation