FINAL WITH BUGS