making it shorter for devbeat. Hope I finish in time :s