Add bimodal & gravity