updated framework
updated framework (continued)