Update with more functionality

Props to wpfunction.me