added options class fully complete