implemented features for alpha release