@moderndeveloperllc think it can be made optional?