updated framework, fixed bug