Updated with some more functions.