Most code is refactored now