Preparation 2.4.1

Made database the new way