Code edited and shorted