added comments TODO