updated to make work on fresh install