adapted future improvements