Added Tips and remove a restriction