Edited for updates