Complete the dynamic functions + add note for a bug