Deleted too much code, undoing some parts