Open to any suggestions on any improvement