Updated to my needs