This could probably be moved to line 92