kept with current coding style -- cheers