Adding new functinality and redesigning