Made a few changes
This is a temporary class, will be added to AM class