made options more dynamic