remove load function
fix bugs based on feedback