Made creative changes based on DBC challenge