quick hack support, not the final version

temperary commit