Reintroduced things wronly removed in merge