added some unstable form
merging stuff