working on AT-3. End of day commit