Added functions, removed pointless one