Changed basically everything