nicklausw keep things updated, although still broken