maybe some performance updates and some functionality