Updated with a few more functions