now (should) work on all computers