slimmed done methods and code