still bug fixing ..