Adding revamped functions