bug fix/logic fix/future suggestion