Attempting some modifications.