more framework stuff added