removed option type and used boolean instead