moved method-definitions back to server-only