added less magic