made more changes, hope it displays