Cleaned '_2' code