Some more changes by @shutt1e