Added note to self for future improvements