added levels and took out random
mergeconflicts