Changed to proper initialisation approach