modified levek components... still WIP..