Minor updates will wait for possible answer from Stack Overflow