Major update - for a tiny module ;-)'