Committed my changes from local

All the things.