working on added set functionality