hope to fix few bugs