UI effects added, uncommented some part