added electric repulsion and surface tension