Version 1.6: Condensing code