Added dummyfunctions and cleaned up code