Add two features strictly for deployment

Remove once deployed