Changes as requested by @Bertram25