First changes, not working yet.