more towards correct assembly