Major design changes will be impelemented soon